370cb11a3bf97df5de68ac0a771e298849b1e700,uportal-war/src/main/java/org/jasig/portal/portlet/container/cache/PortletCacheControlServiceImpl.java,PortletCacheControlServiceImpl,cachePortletResourceOutput,#IPortletWindowId#HttpServletRequest#number[]#String#Map#CacheControl#,356

Before Change


		
		if(cacheControl.isPublicScope()) {
			Serializable publicCacheKey = generatePublicScopePortletDataCacheKey(definitionId, portletWindow.getRenderParameters(), portletWindow.getPublicRenderParameters());
			int ttl = findMinimumCacheTTL(publicScopePortletResourceOutputCache.getCacheConfiguration(), cacheControl);
			Element publicCacheElement = constructCacheElement(publicCacheKey, newData, ttl);
			this.publicScopePortletResourceOutputCache.put(publicCacheElement);		
		} else {

After Change


		newData.setHeaders(headers);
		
		if(cacheControl.isPublicScope()) {
			newData.setCacheConfigurationMaxTTL(new Long(publicScopePortletResourceOutputCache.getCacheConfiguration().getTimeToLiveSeconds()).intValue());
			Serializable publicCacheKey = generatePublicScopePortletDataCacheKey(definitionId, portletWindow.getRenderParameters(), portletWindow.getPublicRenderParameters());
			Element publicCacheElement = constructCacheElement(publicCacheKey, newData, publicScopePortletResourceOutputCache.getCacheConfiguration(), cacheControl);
			this.publicScopePortletResourceOutputCache.put(publicCacheElement);